keystone2: config: align names of images with MCSDK

The Multicore Software Development Kit (MCSDK) provides foundational
software for TI KeyStone II device platforms. It's supposed to be used
with uboot, and it's convenient to have the same names for images, so
correct environment image names according to the last MCSDK3.

Signed-off-by: Ivan Khoronzhuk <[email protected]>
Reviewed-by: Tom Rini <[email protected]>

diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h
index 6b87f6c5eb7cd9cd34a45109eab635ad9696f274..d83e07e24238bcd1d124c9ddf07371bef6d38171 100644 (file)
--- a/include/configs/k2e_evm.h
+++ b/include/configs/k2e_evm.h
@@ -21,10 +21,11 @@
        "addr_mon=0x0c140000\0"                                         \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"           \
-       "name_fdt=k2e-evm.dtb\0"                                        \
+       "name_fdt=uImage-k2e-evm.dtb\0"                                 \
        "name_mon=skern-k2e-evm.bin\0"                                  \
        "name_ubi=k2e-evm-ubifs.ubi\0"                                  \
-       "name_uboot=u-boot-spi-k2e-evm.gph\0"
+       "name_uboot=u-boot-spi-k2e-evm.gph\0"                           \
+       "name_fs=arago-console-image-k2e-evm.cpio.gz\0"
 
 #include <configs/ks2_evm.h>
 

diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h
index 33e43eb08bc48c3e20ce37a9f61f3a1bd2d08910..ffddf1391c435e9fbd5b43e1c6b1d93f2afbf34f 100644 (file)
--- a/include/configs/k2hk_evm.h
+++ b/include/configs/k2hk_evm.h
@@ -21,10 +21,11 @@
        "addr_mon=0x0c5f0000\0"                                         \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,2048\0"           \
-       "name_fdt=k2hk-evm.dtb\0"                                       \
+       "name_fdt=uImage-k2hk-evm.dtb\0"                                \
        "name_mon=skern-k2hk-evm.bin\0"                                 \
        "name_ubi=k2hk-evm-ubifs.ubi\0"                                 \
-       "name_uboot=u-boot-spi-k2hk-evm.gph\0"
+       "name_uboot=u-boot-spi-k2hk-evm.gph\0"                          \
+       "name_fs=arago-console-image-k2hk-evm.cpio.gz\0"
 
 #include <configs/ks2_evm.h>
 

diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h
index 07326fc7f5627ec92cb694f5c76940495e5c8a53..805164a679defaa67f2f03e19df9b62ca228b2e3 100644 (file)
--- a/include/configs/k2l_evm.h
+++ b/include/configs/k2l_evm.h
@@ -21,10 +21,11 @@
        "addr_mon=0x0c140000\0"                                         \
        "args_ubi=setenv bootargs ${bootargs} rootfstype=ubifs "        \
        "root=ubi0:rootfs rootflags=sync rw ubi.mtd=2,4096\0"           \
-       "name_fdt=k2l-evm.dtb\0"                                        \
+       "name_fdt=uImage-k2l-evm.dtb\0"                                 \
        "name_mon=skern-k2l-evm.bin\0"                                  \
        "name_ubi=k2l-evm-ubifs.ubi\0"                                  \
-       "name_uboot=u-boot-spi-k2l-evm.gph\0"
+       "name_uboot=u-boot-spi-k2l-evm.gph\0"                           \
+       "name_fs=arago-console-image-k2l-evm.cpio.gz\0"
 
 #include <configs/ks2_evm.h>
 

diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index def52748ef845b096760e6098545b26122a48ed9..39973e805ddec1def53c640e9d347ed5908d6298 100644 (file)
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -258,8 +258,7 @@
        "addr_ubi=0x82000000\0"                                         \
        "addr_secdb_key=0xc000000\0"                                    \
        "fdt_high=0xffffffff\0"                                         \
-       "name_fs=arago-console-image.cpio.gz\0"                         \
-       "name_kern=uImage\0"                                            \
+       "name_kern=uImage-keystone-evm.bin\0"                           \
        "run_mon=mon_install ${addr_mon}\0"                             \
        "run_kern=bootm ${addr_kern} - ${addr_fdt}\0"                   \
        "init_net=run args_all args_net\0"                              \